bitkeeper revision 1.1041.1.16 (40eafe95g-dX5S31rejiqR_01dEwUQ)

Minor ACPI tweaks to move ever so slightly toward 2.6 and make ia64
(based on 2.6) easier.

diff --git a/xen/include/acpi/acpi_bus.h b/xen/include/acpi/acpi_bus.h
index 50eaf61c0aec44d722b1babd8e1443199abfb2b7..4326bc934b413ad805eba4b641cd7beba9bd0a46 100644 (file)
--- a/xen/include/acpi/acpi_bus.h
+++ b/xen/include/acpi/acpi_bus.h
@@ -36,8 +36,6 @@
 
 #include <acpi/acpi.h>
 
-extern int                     acpi_disabled;
-
 /* TBD: Make dynamic */
 #define ACPI_MAX_HANDLES       10
 struct acpi_handle_list {

diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h
index 35d45f41518d16a1de284c22dfe79d28c1cb2b46..be7d6dfda71fdfa9c5da85a598ba761936ce8d7f 100644 (file)
--- a/xen/include/asm-x86/acpi.h
+++ b/xen/include/asm-x86/acpi.h
@@ -108,6 +108,7 @@
 extern int acpi_lapic;
 extern int acpi_ioapic;
 extern int acpi_noirq;
+extern int acpi_disabled;
 
 /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
 #define FIX_ACPI_PAGES 4